Merge "Remove WRITE_DEVICE_CONFIG permission from shell user" into main