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

Change-Id: Idb18d226c2d7d427fcbb61ff2218d5fd034cb63e