Merge changes If012cdaf,I74bb5027 into main

* changes:
  Add AppFunction entries for non-spa App info settings
  Add AppFunction entries for SPA App info settings