Merge "Fix interaction w/ work profile & last chosen"