Merge "[2/n] Fix tests before adding modal permission check" into main