Merge "Update the strings for "show all apps"" into oc-dev