Merge changes Ia1d30608,I5ae681f7 into main

* changes:
  Don't update visual stability when lockscreen hasn't changed
  Don't collect lockscreen transition value with Flexi off