Merge "Add permissions screen to advanced apps"