Merge proposals dependent on lp://qastaging/~andreas-pokorny/mir/bump-input-platform-abi-for-0.22

1. bump-input-platform-abi-for-0.22
2. Dependent merge proposals