Merge "shell: allow setting debug_prop and powerctl_prop"