Merge "Allow mock modem shell access without root access" into main