Merge "Fix layout of Apn Settings screen" into lmp-dev