Merge "Don't include sysUI insets on secondary displays"