Merge "Mark screen rotation as early (2/2)" into qt-dev am: a604f0a824
am: d717a27ba4

Change-Id: I3e3a7b15956939e616a989376962f94e404e3fa4