Merge "Avoid crashing during orientation changes." into rvc-dev