Merge "DO NOT MERGE New back affordance small polish nits" into tm-qpr-dev