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