Feature Orchestrator Extension: Genericization & UI (5/5), Fixes AB#3545057#405

shahzaibj merged 2 commits intomasterAzureAD/android-complete:masterfrom

shahzaibj/plugin-5-extensionAzureAD/android-complete:shahzaibj/plugin-5-extensionCopy head branch name to clipboard