Merge changes I10cfbbd4,Id54ee363 into main

* changes:
  Fix QS touches with NSSL migration
  Add NSSL alpha support for DREAMING<->LOCKSCREEN