Merge "Delay color picker back navigation until apply is complete" into main