Merge "Remove applyBackground param in decorator" into main