Add back Camera2 overlay

Change-Id: I0201434a9c5358e668353d73fb5c2ba033440917