Merge changes I2653ce58,I0667776e into main

* changes:
  Stop MediaProjection on (phone) calls ending
  Refactor MediaProjection stop-on-lock