Merge "Call setAdapter from handleLayoutChange for the other profile" into rvc-dev am: 5527ace031

Change-Id: Ie14d3463748c8bf4da051f63f02daa8c328af17c