Merge "Revert "Don't no-op on resuming top activity if display is in freeform.""