Shooter: caf panel work
 - adjust panels back to caf
 - testing caf 3d panel stuff

Change-Id: I7d6372b13be3130ee853921adb27fbef413a65f8