Merge "Clean up manage_applications_apps.xml"