Merge changes Id81c1b66,I87eb6cf2 into main

* changes:
  Smooth out tap-to-expand notification
  Ensure burn-in doesn't impede insets