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

Change-Id: I035880f9702a2f3978e951cda519c40d4fabd19a