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