Merge "Add optional permission review for legacy apps - settings"