Merge changes from topic "revert-17073604-presubmit-am-787ed0a55f5040968a8a9c14764ddd01-HJDYCJUYCZ" into tm-dev

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