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

Change-Id: I136cd337d23c60465b18b4162ad4cdd7e6fc8652