Merge "Merge sleeping activities with visibility updates"