Merge "Clear "restore" mode when setting windowing mode" into main