am: 2a61cc8032 * commit '2a61cc803203e605b1f4a017deec0aedb21605f3': DO NOT MERGE Fix jank when intent resolver/chooser windows animate in
am: 2a61cc8032 * commit '2a61cc803203e605b1f4a017deec0aedb21605f3': DO NOT MERGE Fix jank when intent resolver/chooser windows animate in