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

Change-Id: Icdf7d27aa701926e3fe2ca0cd5f0ccf46d456df1