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