Merge "Fixed an APN grey out issue" into lmp-mr1-dev