Merge "Dismiss keyguard when resuming visible activities" into klp-dev