Bug Fixes

 * HALO landscape orientation freeze
 * Animation clean up (remove number batch when clearing HALO)

Change-Id: I7caf6ac0786d5ffb8645d0bda033c8655559c835