Merge "Use aconfig for Shade Migration flags" into main