Update with upstream and merge pending PRs

It seems to me that people are missing out and I would like to give them the possibility to test the functionality from the pending PRs and provide feedback.

https://github.com/ionic-team/ionic/pull/18561
https://github.com/ionic-team/ionic/pull/19087