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 am: e811873b
am: f62c6372
Change-Id: Ic1434ccc7a4ec01957a7d1219fa5cf6cc1f84948