Merge "Bringing new Chooser UI closer to spec" into mnc-dev