Merge "Introduce a new flag to guard keyboard synchronization." into tm-qpr-dev