Merge "When restrict, use uid inside AppInfo" into pi-dev