Merge "Fix jump in animation for hotseat while re-arranging icons" into tm-dev