Merge "Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev am: 0823c9ff5c am: 641160b7d4" into oc-dr1-dev-plus-aosp
am: 2e26c880b2

Change-Id: I6bc39ca7e61285da880eb5b3916b4828f6745d41