Merge "Handle user changes off the main thread." into lmp-dev