Merge "Add dialog when restrict apps are more than 5" into pi-dev