Merge "Tweak error fallback behavior for view direction resolution"