Merge "Fix Colors crashing on rotation"