Merge "Fix blocked number edit text direction and gravity"