Merge "Hide preference when no app restricted" into pi-dev