Bug 948226 - Activity orientation lock order

Conflicts:
	apps/system/test/unit/activity_window_test.js