Merge "DO NOT MERGE - Do not show Bluetooth icon when headset is not active" into qt-qpr1-dev am: 30468d0963

Change-Id: Iff4107d0f29ec0643615a94d858ef5d2203f1451