Merge changes from topics "presubmit-am-57df09df9e9348a88546e2cb192e5c28", "presubmit-am-787ed0a55f5040968a8a9c14764ddd01" into tm-dev

* changes:
  Remove temp user creation activity
  Scrim was flickering on FPS unlock