Merge "Remove ops preference from specific app" into pi-dev