Merge "Fixing the menu overlap with the system bars under half oval type." into sc-dev