Merge "Only check activity rotation allowed when considering menu layout" into ub-launcher3-master