Merge "aq-mode=3: Don't reset segment if block is determined to be skin."