Merge "Skip resuming activities on sleeping display"