Revert "Revert "Merge remote-tracking branch 'upstream/master' into bubble-tea""

This reverts commit a76dc9b333ef8b24e0ea20e50116abb1914ab285.
fix app_window_manager.js
Fix .gitignore for music2 [NPOTB]
Bug 962380 - [DSDS] When SIM 2 is primary outgoing call, ...

dialing out emergency call under airplane mode will not successfully turn off airplane mode.
Bug 978687 - Pressing the 'home' button when the utility tray is opened, hide the utility tray and pan the homescreen. r=etienne
Make background scroll with content in SMS
Bug 977450 - AppChrome should not be instantiated if no navigation specified in manifest.
Bug 964337 - Implementation a mechanism to edit Homescreen Bookmarks
Bug 978780 - position: fixed create an extra repaints when panning apps. r=crdlc
Bug 979230 - [Camera] Focus fails on front camera
Bug 971006 - Remove a sync reflow when showing the utility tray. r=etienne
Bug 979320 - Bolster wait in wait_for_cards_view to avoid edge gesture hit zones
Revert "Bug 972600 - [B2G][Contacts] After merging duplicate contacts selecting edit contact button brings up 'Add contact' screen"

This reverts commit 8e41704de226a75ce5ce6420b70016f39eb57ea6.

Reverting test due to intermittent test failure.
fix redundant background colors
Bug 819080 - Add performance testing for the fmradio HAL
download firefox from s3
hardcode b2g to s3
Bug 930784 - Add option to run js ui tests in parallel
Revert "Bug 973156 - [Music] Send mozinterruptbegin and mozinterruptend to media playback widget for displaying the correct play status"

This reverts commit 0682e21ae9c7406828ad013c9238e4aa1fe84fe1.
Update for running tests without building profile