Merge "Revert "Support insets on secondary displays""