Merge "Fix missing gear icon on "More" toolbar button" into pi-car-dev am: 011ab9980a am: 892c95ced7

Change-Id: I8765c1a012d99b5394c32260aa6128c628f96400