Merge "Add NoDisplay test when resuming Activity"