Fix ui-3.0-issues from [checklist](https://docs.google.com/spreadsheets/d/10Yf9BKxLM-0IQSADob-f7m52sV0c4hOXcII2o761YHY/edit#gid=1487003014) in exp1 to exp10
