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

* commit '6c477a29bfc604f6dbf90e0d4ac5c99bc0ed2ff7':
  Call startInput on return from sleep mode