Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev