Merge changes from topic "am-d7b860f56d004ac58ca29c35354adf1d"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Remove taps option from screen record dialog" into sc-v2-dev am: 3a2fe51e9f am: 5977c2c026 -s ours
  [automerger skipped] [DO NOT MERGE] Remove taps option from screen record dialog am: 19c76901bb am: c2c7e23ba6 -s ours