Bug 1089529 - Lockscreen error after screen off and on when device shows NFC shrinking UI
Merge pull request #25990 from snowmantw/bug1089529-2.0

Bug 1089529 - Lockscreen error after screen off and on when device shows...
Bug 1048673 - [Ringtones] stop the previews before leaving the app
Bug 1085201 - [Flame][Tako][v2.1][Settings] "Searching device" not hidden as Sony SBH50 BTHS paired via NFC
Bug 1043762 - Volume buttons don't do anything in Settings and previewing new ringtones
Bug 1083053 - [Midori] The screenshot preview window still overlays an app when switching apps
Bug 1091137 - [ringtones] Fix clearing out the tonePlayer's state when hiding the app

Conflicts:
	apps/ringtones/js/tone_player.js
 Bug 998106 - [B2G][Gaia][FTE][Keyboard] Selecting languages other than
 English during the FTE causes the associated keyboard not to load.
  - Filter out "language to layouts mappings" if the layout is not
    preloaded.
Merge branch 'v2.0' into v2.0m