Merge "Update control bar overflow button selected state" into pi-car-dev am: fe5c5aaa3c
am: c58f2ba9b7

Change-Id: Ie844c42a371b1632a91042a6625feb5051aa459a