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