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

* commit '3ab3ffc646f311f03f464e175f0d4f73c79c0d68':
  Fix Keyguard drawn timeout