Merge "Sticky placeholder and adjacent finish rule in Settings" into sc-v2-dev