Merge "Color picker: don't show keyboard on start" into p9.0