Merge "Ensure that activities behind keyguard are paused." into klp-dev