Merge "Delay adding app settings link until data fetch returns, to avoid...

Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev