Merge "Fixed data connection toggle UI issue due to local cache maintained." into lmp-mr1-dev