Adustments for State picker handling ofdifferent input field heights (Offices module)