[TIMOB-17998]: Fix picker layout issue for Lollipop

Testing steps in JIRA