Merge "Ignore folding feature when it is not on the active display." into sc-v2-dev