Merge "UI polish for affordance reenablement dialog." into tm-qpr-dev