Merge "Initialize color mode if set" into pi-dev am: 5cb4117353
am: 08fa42f6d0

Change-Id: Ia3da8eb5b4da67595054a57e44363c345c142336