Merge "Refactor all_apps.xml contents to  all_apps_content.xml" into tm-qpr-dev