Merge "Place split selection placeholder view based on option selected" into sc-dev