Merge "Simplify the setup of the fragment container in CategoryFragment." into ub-launcher3-master