Merge "Do not bind appcompat overrides on app zygote" into main