Bug 990537 - [DSDS] Messaging. Apply Visual Refresh to DSDS scenarios r=schung

* use :before instead of :after so that we re not affected by building blocks
* add the sim indication back
* use the correct style for the sim indication
* move the dsds CSS to composer.css
* correctly center the counter and MMS indicators

(cherry picked from commit 1391064a106b66b02b0b7b9e7e43c9bc775ba586)

Conflicts:
	apps/sms/index.html

* adds an hacky property file so that we don't need a localization on v2.0
Merge pull request #20392 from fcampo/import-bt-err-tap-1022115

Bug 1022115 - [Contacts] Can't see detail of contact when multi import via Bluetooth (r=francisco)
Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
	apps/communications/contacts/test/unit/mock_activities.js
Merge pull request #20880 from chuck-lee/bug-1010252_reconnect_issue

Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
Merge pull request #20986 from frsela/STK/Bug1027521

Bug 1027521 - [Sora]Phone returns to wrong screen when trying to return to previous screen in STK menu, r=jaoo
Merge pull request #21395 from julienw/990537-v2.0-dsds-refresh

Bug 990537 - [DSDS] Messaging. Apply Visual Refresh to DSDS scenarios
Bug 1032288 - Intermittent failing test, Vertical Home - Packaged App Update resume update, TypeError: entry.app.manifest is undefined
Merge pull request #20150 from eliperelman/bug-837668-implement-loading-events-dialer

Bug 837668 - Implementing new startup loading events in Dialer app
Conflicts:
	tests/performance/startup_events_test.js
Merge pull request #20464 from jrburke/bug837677-email-startup-events

Bug 837677 - [e-mail] Implement new startup loading events r=mcav
Conflicts:
	tests/performance/startup_events_test.js
Merge pull request #21237 from KevinGrandon/bug_1032933_search_marketplace_icon

Bug 1032933 - [Search] Use closest icon size for marketplace results
Merge pull request #21267 from Cwiiis/bug1031287-squashed

Bug 1031287 - Fix removing transitions from cards in task manager. r=alive
Merge pull request #21309 from jrburke/bug1033628-email-search-overlap

Bug 1033628 - [B2G][2.0][l10n][Email]Tamil: Searching email in Tamil causes the window to shift off screen r=mcav
Merge pull request #21302 from KevinGrandon/bug_1033465_collection_readd_pinned

Bug 1033465 - [Vertical Homescreen] Cant add pinned sites to a smart collection
Merge pull request #21234 from borjasalguero/webcontacts_contact

Bug 1032871 - [Contacts] There is no way to pick a contact with filter '...
Merge pull request #21019 from crdlc/bug-1029847-v2

Bug 1029847 - [B2G][2.0][Flame][Vertical Homescreen] Icons dont keep the same order after OTA update
Merge pull request #21191 from jimporter/ringtones-create-window-stack

Bug 1030954 - [ringtones][window management] create ringtone screen does...
Merge pull request #21236 from jimporter/ringtones-mp3

Bug 1032702 - Cannot select preloaded MP3 as ringtone
Merge pull request #21242 from KevinGrandon/bug_1030440_vertical_default_layout

Bug 1030440 - [Vertical Homescreen] Optimize default icon configuration
Merge pull request #21213 from pacorampas/USSD-screen-1030049

Bug 1025631 - Incomplete visual refresh for USSD screen r=rik
Bug 1033926 - [Vertical Homescreen] Statusbar does not get opaque after exiting an app using the keyboard and re-entering it
Merge pull request #21280 from julienw/1022755-dont-scroll-if-in-wrong-panel

Bug 1022755 - do not scroll if we're not in the right panel r=azasypkin