Merge "Call setAdapter from handleLayoutChange for the other profile" into rvc-dev am: 5527ace0 am: 7eabb04f Change-Id: I58f3f9bf3eabcea804c5d195936cefcc6e914984