Merge "Make sure to always upgrade runtime permissions" into qt-dev