Merge "Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df0317 am: fed46df3 am: 4bd59233" into rvc-qpr-dev-plus-aosp