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

Change-Id: Ia4def66e47faf702c22a4e3aba04d52965052aa8