Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev
am: 289583ec1a

Change-Id: Id0886d75e65fed676d828d7d0f1e6783c6a1d837