Merge "Fix display fade-out animation" into rvc-dev am: a8dfb52c am: 57b1ad41 am: e735df79 am: 8b1e7542 Change-Id: I11e93ee1623ca38699549cb771bb07db557f4a4c