Merge "Adding keyboard focus support for phones."