Merge "Merge "Fade from black when reach" into qt-r1-dev am: 331cdb72e6 am: f81411592b" into qt-qpr1-dev-plus-aosp
am: eb9c76efab

Change-Id: I338d0b1e7ad9c3855cca05d9168db7fc6b139fb9