Merge "[Test Week] Add ViewOnDrawExecutorTest" into main