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

Change-Id: Ifec8c2e6368e01e47ae2fdf6fecded4a7aa9172e