am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev

* commit '231bd6c514f15cb0b42a04d4fc7fc9631c743686':
  Dismiss keyguard when resuming visible activities