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

Change-Id: I8b7336d7b66747b77a8a0c0be7524dc1a29a66d1