Merge "Moving mState from Workspace to StateManager" into ub-launcher3-master