Merge "Change owner info to be a dialog rather than screen"