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