Pull sprite enhancements into camera branch