Merge "Fix bad theming on owner-info" into mnc-dev