Merge "Fix NPE accessing fragment arguments"