Merge "Revert "Lock launcher to portrait on devices less than sw720dp"" into jb-dev