Merge "Don't show empty account list in account chooser." into oc-dev