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

Change-Id: Icc818b9e7c18ed6f9d6561382162c6604c50040e