Merge "Adds restore/setup specific dex flag" into rvc-dev