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

* commit '5e024a3c9cf31021106f892fca0f83af3be029aa':
  Fixing regression where the proper rotation check was not being done. (Bug 6422040)