Merge "Changes for bluetooth keyboard support."