Merge changes I74bfc0d5,I577f9d36 into klp-dev

* changes:
  Delay tearing down external displays until keyguard finishes
  Show keyguard scrim on external displays while keyguard showing