Merge "Fixing regression where the proper rotation check was not being done. (Bug 6422040)" into jb-dev