Merge "Update system theme only after transition" into main