Merge "Support multiple Views of extra hotseat content" into ub-launcher3-master