Merge "Reset protection path on rotation" into qt-qpr1-dev am: cf0544b0 am: 789ae763 am: 5c7efc04 Change-Id: I673441e7b2548cda98dcf61c3c0e6a86fec1baeb