Merge "Update test infra to allow split placeholder view in all apps" into main