Merge "Merge compat fake focus properties into one" into tm-qpr-dev