Merge "Disable color extraction for media" into pi-dev am: 20ebb0a6d8
am: 0ce5fae47d

Change-Id: Ib842fd3bf1726e81e6ef8a9443fee273e26da964