Merge "Moving some recents controller methods into wrapper class and better tracking the controller states" into ub-launcher3-master