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

Change-Id: Ia1b3d52bdcf7a8d9c436ccb643f33dd33a6bab9a