Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev