ref: 3c092e2474fdcef4c9d5383d5a1fe8e8db676e5b
parent: b50e0badbcbbe618a184e90006207e067cc71429
parent: 3d6b8a667f67b6c0f0689cb45a48b8510a64e0ce
author: Alex Converse <aconverse@google.com>
date: Thu Sep 10 19:04:46 EDT 2015
Merge changes Ibb308526,I99e330f8 * changes: Prevent CR in screen mode from refreshing flat inter blocks forever. For screen content consider intra uv when color_sensitivity is set.