Merge changes I4bd2bc4c,I2ccb344a into main

* changes:
  Fix wrong notification content alpha
  Clean up dead code from SwipeHelper