Merge "Fix keyboard navigation in drawer" into ub-contactsdialer-i-dev
am: 3f9e1873a4

Change-Id: I8d42cd17febf7c71b10cad7d63739b43a3ec4867