Merge "Disable display compat toolbar using left system bar" into main