Merge "Require sharing shortcuts for the conversation space" into rvc-dev am: a8afb50f am: 6b83867f Change-Id: Id9df94cf003cba1e2c33ce9d17e13aa66a317129