Merge "Fix a couple bugs with back button visibility" into ub-launcher3-master