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