[automerger] Optimizations to reduce all apps jank. am: 7f522a25c3 am: 00abdaca61

Change-Id: I3a79d31b61488e51d149a1585ad2b5f8010e878b