Merge changes from topic "am-6d9ca486-65ce-4826-896a-aaf2c33186f9" into ub-launcher3-master

* changes:
  [automerger] Reapply back button alpha at end of state animation am: 5273b695c2 am: ac5a07cb59
  [automerger] Reapply back button alpha at end of state animation am: 5273b695c2
  Reapply back button alpha at end of state animation