Merge "Adds user broadcasts to UserManagerHelper." into pi-dev