Trump is going to be the key factor in this. I believe something will come out of the Senate first. What happens in the House will depend on Trump's opinion of said Senate bill.
__________________
Self filed AOS │Apps Received By USCIS - 3/18/19
│Biometrics Done - 4/11/19
Interview Scheduled - 4/24/19│Interview Date - 5/31/19│AOS Approval - 5/31/19
Permanent Resident Card Received - 6/8/19