Merge "Suppress compose compiler error for default value" into main