Merge "Revert "Revert "Remove exception from OverlayConfig zygote method""" into rvc-dev