Merge "Add unit tests for planner's LayerState" into sc-dev