Merge "Remove "Allow persistent changes to the vendor overlay theme""