Merge "Make auth fill UI size sane size" into oc-dev