Merge "Remove PIP tuner items" into oc-dev