Merge "Call setAdapter from handleLayoutChanged." into rvc-dev