[automerger skipped] Merge "Mark screen rotation as early (2/2)" into qt-dev am: a604f0a824 am: d717a27ba4
am: 87a0c23888 -s ours
am skip reason: change_id I2b0d63bbf4143b9273a502ced451867f69e42636 with SHA1 ef4b601381 is in history

Change-Id: I88a515ef12abdd7abc96c8bac075f9301ec92895