Merge "[SettingsLib] Add method to allow using a non collapsing toolbar" into main