Merge "Overflow button icon - plus instead of three dots" into rvc-dev am: bedaeb25 am: 58074ec5 Change-Id: I495f5f3dd81f3dec5d4102ec79d226c22c8934ec