Merge "Merge "Call setAdapter from handleLayoutChange for the other profile" into rvc-dev am: 5527ace031 am: 7eabb04fb9" into rvc-d1-dev-plus-aosp am: 967a7243f3

Change-Id: Ic52086a7cbd8bb54302eb8626cea92a21a833591