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