Merge "Hide Default apps and App permissions under Advanced." into pi-dev