[Fixed?] Issue With Emperor's Throne Room Elevator Mantis #4451

Change-Id: I4d9e2c98d56989a1241ae9ee71bedd497e80f90d
Merge "[Fixed?] Issue With Emperor's Throne Room Elevator Mantis #4451" into unstable