Merge "Remove snapshot when screen gets rotated in mean time" into oc-dev
am: 0823c9ff5c

Change-Id: Iee0f34f4a285b02d3747f630058ef6fad50d4c79