Merge "Fixed overlapping fragments issue."