Bug 962504 - Investigate intermittent fail on test_cost_control_reset_wifi

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/cost_control/test_cost_control_reset_wifi.py

Bug 956942 - updated icons for the 'organic' skin, uplift to v1.3

Bug 949358 - Orientation management for callscreen + lockscreen + active app

Conflicts:
	apps/system/js/orientation_manager.js
	apps/system/test/unit/orientation_manager_test.js