Merge "Ensure permissions granted for correct SIM" into qt-r1-dev