Merge "Uprev remote-shell to 6 and aura-shell to 63" into main