Merge "Only wake to lock screen if AOD is on"