Merge "Remove contentSub from layout when empty"