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