Merge "Fixed a few bugs with remoteInput" into qt-r1-dev
am: 38c54e15a4

Change-Id: I9bdb17249b4e83b9dbe656b739c0842ef399e95b