Merge "Merge "Null-check the desaturating view, it might be gone." into rvc-dev am: b19c92dc am: b40378b0" into rvc-d1-dev-plus-aosp