Merge "Fixing two critical bugs in all apps transition controller" into ub-launcher3-calgary am: b7d16b7e5c
am: f4502973cc

Change-Id: I5ff208db9d23b5348aa88015650c962278aaf49b