Merge "Add an overlay for photo preview" into rvc-dev