Merge "Fixed a crash with remote input" into qt-r1-dev
am: 7c33cbcbcc

Change-Id: Id95e297df37d1fda9f1c7a580343a8fbc9f6ef2b