am 54bc30df: am a35ada48: am 3ab3ffc6: am b7ae1990: am bd29b07e: Merge "Fix Keyguard drawn timeout" into mnc-dev

* commit '54bc30df5a0211a026e5f804b3ea26dd6a626723':
  Fix Keyguard drawn timeout