Improve scene detection and proper caf-mode

Change-Id: Ic96a7a9f97134a34795d7d23d74378ba552b83ef