Merge "Revert "Settings: Export OmniJaws settings activity"" into p9.0