Merge "Update id for Toolbar"