Merge "Add @AppModeFull for those tests which will bind socket"