Merge "Refactoring floating view opening/closing logic" into ub-launcher3-master