am f80fa0b5: am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode"

* commit 'f80fa0b5d9b5567731dc19b4b5fc73816c131910':
  Call startInput on return from sleep mode