Merge "Don't call setKeyguardGoingAway on background thread" into rvc-dev