Merge "Adds support for restore dexopt flag" into rvc-dev