Merge "Move autohold processing into separate method"