Merge "Link partial convo controls to Settings" into rvc-dev am: 629ebb174b

Change-Id: Ib7d3deb4324b867fc2732721e0802b659f72d099