Merge changes I7320f818,Ic69c3c1c into main

* changes:
  Fix clock flicker after unlock
  Fix hun/pulsing swipes