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

Change-Id: I9452aaa48ec6ab44caaff34efff26451b8248f7a