Merge "Remove paste into folder from menu items" into rvc-dev am: eda6a76e26 am: c48b128da3

Change-Id: Ibcba6a53e21ddc6a1488203694f7a5ddd63b1b82