Merge "Fix setting null target fragments"