Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev