Bug 961938 - follow-up gjslint fix r=me
Merge pull request #15653 from dominickuo/bug-946556

Bug 946556 - [Music] Disable the play controls when using a bluetooth headset in a call, r=jimporter(cherry picked from commit 0646bf911164ca9e2f80a6b703558bed35b449b2)

Conflicts:

	apps/music/index.html
Merge pull request #14901 from etiennesegonzac/bug-952099-better-hang-up-hit-target

Bug 952099 - Better hit target for the call screen hang up / pick up buttons. r=rik
(cherry picked from commit f400efc804366c7b7cf5476d1d5d325e6651ee71)
Bug 957709 - Patch to prevent Camera/Gallery switch buttons from being hammered.

Update patch for 957709 after djf's review.

Updated PR 15845 following review.

Clean up.

Fixed typo in comments.