Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev