Bug 864684 - Prevent two way scrolling if it is not neccessary. r=vingtetun
Bug 823999 - Disable diagnostic logging and add logging to PermissionPromptHelper. rs=gwagner
Bug 855556 - Test the cached branch of getAll more extensively. r=gwagner
Bug 865210 - Set a valid window icon for B2G desktop; r=vingtetun

--HG--
extra : amend_source : 999001892223313d953ac121d18bee6937d7c48e
Backed out changeset 0444a6571cac for bug 865210 due to build bustage.

--HG--
extra : amend_source : 9cc742fbbbaaa823d6f770a31cc61fbc6f75754e
Merge m-c to birch.
Bug 860559 - Add pref field to ContactField and ContactAddress. r=gwagner sr=mounir

--HG--
extra : rebase_source : 098d9071232058bdf4a0f9547398eca9c4303106
Merge m-c to birch.
Bug 847255 - [Bluetooth/AudioChannel] A2DP failed to start session due to music resume too fast during SCO is disconnecting. r=baku
Bug 860150 - [Audio] Audio_Data API should join audio channel. r=kinetik