Merge "Reset protection path on rotation" into qt-qpr1-dev