Merge "more consistently apply filmstip hide animations" into ub-camera-glacier