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