Merge "Clear back stack when editing a screenshot" into rvc-dev