Merge "Enable rollback lifetime API changes during install" into main