Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b
am: 23e8435899
am: f23a64afb8
* commit 'f23a64afb87a6fb1580951970ca322192001e54e':
Change-Id: I9dc9326b1d231fb42d6277c6dbd2ae8f9eedf272
This commit is contained in: