am 44ee0fb1: am c55edb26: Merge changes I74bfc0d5,I577f9d36 into klp-dev

* commit '44ee0fb144947206713e6527a5227fd44e2d4e1e':
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing