[DO NOT MERGE] Prevent hotseat touch hijack am: acf0a5da0b

Change-Id: Ida37c56460f87ef527756978092600581300eb4e