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

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