Merge "Fixing onStateTransitionEnd is not called at the end of reset state" into ub-launcher3-qt-dev am: 234fc60302
am: bb117d7b42

Change-Id: Ie07ebe7afb437749fe4409660f4528a04588c3e1