Merge "Hide unused app toggle if no revocable permissions" into sc-dev