Merge "Update control bar overflow button selected state" into pi-car-dev