Merge "Fix display fade-out animation" into rvc-dev am: a8dfb52c0f

Change-Id: Ib1156e2721aed63ade6996129d594d636725bce0