Merge "Add per-app controls for compat fake focus" into tm-qpr-dev