Merge "Dismiss screenshot UI on back gesture/button." into rvc-dev