Merge "3/ Fix inverted ShellInit dependency order (no functional changes)" into tm-qpr-dev