Merge "Call setAdapter from handleLayoutChange for the other profile" into rvc-dev am: 5527ace031 am: a3be13c51a am: 25477119c3 am: 39534352f6

Change-Id: If688ec04b8dabffde873862d41973f290e2997cb