Merge "Fixed that clicking on the remoteinput didn't work from AOD" into qt-dev
am: 70c8685a94

Change-Id: I28c583fa7855ed8e86ffb5d7d5480b96c2538b9a