restore Camera(2) overlay

Change-Id: I33664d909d29ffaa4fff9a1e443265e4e88126d8
Merge branch 'cm-11.0' into martincz