22656 - widget refactor/mobile fixes

Don't merge!