Merge "Support insets on secondary displays"