Merge "Align ClearAllButton to centre when the ENABLE_GRID_ONLY_OVERVIEW is enabled" into udc-qpr-dev