Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev