Merge "Don't override user choice during OTA upgrade or pregrants" into main