Merge "Don't fade out active page outline during drag-and-drop" into sc-dev