Merge "move rcfilters scroll logic to better support mobile mode"