[CM Merge] Camera Overlay, Video and PNG

Change-Id: I12a27e250fca05f98f841aafcc143429f1c1c359