Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev