Merge "Avoid reverting apex on devices that do not support updating apex" into rvc-dev