Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev