Merge "Bringing back auto-rotate settings" into ub-launcher3-edmonton