Merge "Fix nullpointer in updateContent"