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