am 6e9d040d: am ec7ba2a7: am 6893aeee: am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev

* commit '6e9d040d8c21de19b2307e654f7f791cdfb3fff8':
  Fix stuck scrim on keyguard-less devices