Merge "Add empty view to avoid hamburger menu getting initial focus"