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

Change-Id: I50752b51594943c343c181f3303490c0da09dd30