Merge "Fix set[Stacked/Split]Background calls" into klp-ub-dev