Removing the additional wrapping

Not using the "NoSaveStateFrameLayout" if we are already in layouts that has that ability (API 10+)