Merge "Update the restrict app list" into pi-dev