Merge "Fix the potential DOS issue for the Settings Apps page" into udc-dev