Merge "Split applyNewState into enable/disable APN"