Merge "Fixed some small keyboard nav bugs (TabHost, directional focus)" into oc-mr1-dev
am: c8b91ecbae

Change-Id: Ife498c2a72c2053f9d6d7f2ffee6ed63153f2a7b