Merge "Remove vertical/horizontal scroll bar in map"