Merge "Fade out LS UDFPS affordance on QS expansion" into tm-dev