Orientation lock should be separated of Interface lock

Currently, the interface lock has an orientation lock icon confusing users. We got multiple reports about orientation lock not working properly saying that the buttons are grayed out and nothing responds.

I think we should separate the features and if we really don't want to, we should change the icon.