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

Change-Id: Idceccf4b5465c3ce401d1a1418efec24c9318cba