Merge "Merge "Call setAdapter from handleLayoutChange for the other profile" into rvc-dev am: 5527ace031 am: 7eabb04fb9" into rvc-d1-dev-plus-aosp am: 967a7243f3 am: 93914af9e2

Change-Id: I79f99f27d29edb6946794ff69840e40c646f4950