Merge "Only do content fill anim after layout anim" into ub-launcher3-qt-dev
am: 13da82576f

Change-Id: I93424f4bb500dfb8e5fb1be194a7709acdf5e55c