Merge changes I8d01e818,If9611004 into main

* changes:
  Force transition to GONE...
  Fix keyguard y translation while swiping