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

Change-Id: I5c1ee370d7e1601504c9760b64fda068fbedb02a