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

Change-Id: I95a6bfc2247eb98d5c3758589989bcaf2657e072