Merge "Enable useSuspendCounter in SystemSuspend"