Merge proposals dependent on lp://qastaging/~gerboland/qtmir/fix-glcontext-loss-on-reconfigure

1. fix-glcontext-loss-on-reconfigure
2. Dependent merge proposals