Merge "Support non-standard activity type on secondary display"