I remembered someone on Twitter asked the same question and Elon Musk said yes and with the popup stopper at the end if you like:
The problem is: He promises a lot on Twitter but you might have to wait for a long time such as the 2017 promise of air suspension for Model 3: