Merge "Retain Activity Recognition permission state across device update" into qt-dev