Merge "Fix excessive entrance animation duration + delay" into qt-dev am: 6072e42a45
am: ce436b926d

Change-Id: I98c3b9905ed5c661482752cb2b716e850e20de2d