Merge "CachedAppOptimizer: skip freeze when do-not-freeze is set" into main