Merge "Hide app if it shares uid with whitelisted app" into pi-dev