Merge "Move out picker related methods from widgets model" into main