[automerger skipped] Merge "Move app setting link from Entity header to pref controller" into pi-dev am: e3319d0449
am: afb17b6ed1  -s ours

Change-Id: I9d5f00c14ec5092f4f28d5dfc8d9064020d5de8b