am 063de3b9: am 19f8aa18: (-s ours) am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2d...

* commit '063de3b93e543d9073e14542eb0a60385fd74fa5': (21 commits)
  Clearing connected message in stop fixes 7401152
  bouncer: hide more text and frame less.
  Recover from badly behaving 3rd party secure cameras.
  Show bouncer mode for Slide mode in keyguard if widget isn't expanded
  Making challenge come back if within the same gesture you return to the original page (issue 7422999)
  Ensure edge swiping is enforced immediately upon showing keyguard (issue 7453156)
  Fix issue 7468224, make sure to size pages if page changes
  If a default keyguard layout isn't specified, fallback to the default layout
  Use better signal for camera launch.
  Render camera widget on a background thread.
  Fully block user interactions when transitioning to camera.
  Fixing up overscroll / hints on tablet
  Cleaning up the overscroll effect
  Updating UI to new design, widget shouldn't expand until page settles (issue 7467435)
  Making screen hints just side page outlines, as per new design (issue 7467968)
  Clean up separator string in keyguard view
  Attempt to fix MENU key issue.
  Update DevicePolicyManager documentation with new keyguard flags
  Polish user selector accessibility.
  Fix pages disappearing (issue 7456885)
  ...