Merge "Disable color extraction for media" into pi-dev