Merge "Update edit text padding on Bluetooth device renaming dialog" into nyc-mr1-dev