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

Change-Id: Ib8315f8e4adcc8cd1409a5b4df4cd51fbd6b23e8