am 5e5bed60: Merge "DO NOT MERGE Make sure surfaces always have latest orientation info" into jb-mr2-dev

* commit '5e5bed60d03b5556ada351b010ed14ae8f1515ae':
  DO NOT MERGE Make sure surfaces always have latest orientation info