Adapt more of the shooter camera hack to pyramid/holiday

Change-Id: If533b9763e317b19e6acd348f94eeb1cedaa602b