Merge changes from topic "rr-switch-flag" into qt-surfaceflinger-dev
am: b7c5f08ca6

Change-Id: I3c2d159b6fbba9be7a0ed75754c78e9730c6c9ba