Electron beam animation on screen off dual entry clean up.

Change-Id: I973764c04a98a0d28251a7c135f5b36db79aa7d4
Merge remote-tracking branch 'cm/cm-11.0' into HEAD