Bug 948226 - Activity orientation lock order
Merge pull request #15183 from alivedise/bugzilla/948226/activity-orientation-lock

Bug 948226 - Activity orientation lock order, r=timdream