am 46a26d8c: am c9bf387c: am bff51540: am 32655b2c: am 20df4f87: Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose

* commit '46a26d8c518475b41c81a96eaee699dc8d72cd68':