Merge "Take home controls setting into account" into tm-qpr-dev