Merge "Fix ActionButtons background and ripple" into sc-dev