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

* commit 'b7ae19905a471b0e0c74cd76b9895cad93856deb':
  Fix Keyguard drawn timeout