Merge "Move app setting link from Entity header to pref controller" into pi-dev
am: e3319d0449

Change-Id: I5cbc1dc4dfab9df74bca3bda824d38d3b4b778f6