Merge "Show color modes from config_availableColorModes" into pi-dev
am: 5c99a41a9c

Change-Id: I82de74655a8c000580355d857599278c445fe20e