bluetooth: prevent Android restart with buggy devices

Change-Id: Ic15687b6870dcbe44e6bf54755174ed8aadffc9b
Lockscreen Media controls: Fix mdpi layout issues

Before: http://i.imgur.com/56jXhXG.png
After: http://i.imgur.com/wQJV3M1.png

Signed-off-by: kyryljan-serhij <kirilyan.sergei@gmail.com>
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ib3f23a8e2d7e545495d78fe3e6b5a5b8d0adfac9
Merge "Lockscreen Media controls: Fix mdpi layout issues" into jellybean
Merge "bluetooth: prevent Android restart with buggy devices" into jellybean