Merge "Take snapshot when screen is turning off" into oc-dev
am: 64900ad13c

Change-Id: If64b205fc27f33a4359f00fe7f551b9797b1380f