Merge "Add color mode setting am: af5e11245d  -s ours am: 9d8c5f626a  -s ours am: 064b064809  -s ours"