Merge "Make the RC/Watchlist legend not jump when initially collapsed"