Merge "Fix back button not showing in all floating views" into ub-launcher3-master