Merge "Up to date apps must provide conversation shortcuts" into rvc-dev am: c79df04411 am: c7f7d095ee

Change-Id: Id04be0dfd349c8a633f482a6d93670c39120f1fd