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

* commit '27ff54dbb4089626f694339ee0f54c38b8688537':
  DO NOT MERGE Make sure surfaces always have latest orientation info