From 9f9c1e2d97e702d7fcf8685e36a8bf1431e5d3b4 Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Wed, 15 Nov 2017 15:04:24 -0700
Subject: [PATCH 1/2] 9267 Fix not restoring animations after changing view
 modes

---
 libraries/animation/src/Rig.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index f06156874b..78aa1f4ba8 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -179,6 +179,11 @@ void Rig::restoreRoleAnimation(const QString& role) {
             } else {
                 qCWarning(animation) << "Rig::restoreRoleAnimation could not find role " << role;
             }
+            
+            auto statesIter = _roleAnimStates.find(role);
+            if (statesIter != _roleAnimStates.end()) {
+                _roleAnimStates.erase(statesIter);
+            }
         }
     } else {
         qCWarning(animation) << "Rig::overrideRoleAnimation avatar not ready yet";

From 0755e4aa214031b95733a6dcd6c69478bb178110 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 16 Nov 2017 08:53:12 -0800
Subject: [PATCH 2/2] Fix for black screen on HMD derived display plugins

---
 interface/src/Application.cpp | 3 +++
 interface/src/Application.h   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bd31fc398e..4b99d50761 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1825,6 +1825,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // Preload Tablet sounds
     DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
 
+    _pendingIdleEvent = false;
+    _pendingRenderEvent = false;
+
     qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
 }
 
diff --git a/interface/src/Application.h b/interface/src/Application.h
index fbfb3979be..19a6dfdac1 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -708,7 +708,7 @@ private:
 
     friend class RenderEventHandler;
 
-    std::atomic<bool> _pendingIdleEvent { false };
-    std::atomic<bool> _pendingRenderEvent { false };
+    std::atomic<bool> _pendingIdleEvent { true };
+    std::atomic<bool> _pendingRenderEvent { true };
 };
 #endif // hifi_Application_h