Merge "Combine RecentsViewStateController with base class" into main