focus problem fixed - avoid setting combo box data provider when
unnecessary.

Change-Id: Id5f50c4d0fa76a0d3b86eed2ee9e43b923d0d125