Merge "Add location to dream overlay status bar." into main