Merge "Take snapshot when screen is turning off" into oc-dev