mess with overlay for Camera2 again

Change-Id: Ic261f8e4757e2e68d28d29f384df66baefd54327