[FIX] P13nDialog - downport

Change-Id: Iae1d96e7917c139ce62f7461896bd17f458da5d5
CR-Id: 012006153200015572112014
Merge "[FIX] P13nDialog - downport" into rel-1.26