Merge "Finish non-standard activity type when display removed"