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

Change-Id: Ie9dbd4d88f853a7a35e1ba53d9a20dc1b99b79c3