Merge "Do not blur shade while fading away" into rvc-dev