Merge "Reenable the workarond for framework fragment transition NPE" into mnc-ub-dev