Merge "Fix checkKeyIntentParceledCorrectly's bypass" into tm-dev