Merge "Fix divider missing with AppButtonsPreference" into sc-dev