Fix derp on Camera2

Conflicts:
	default.xml

Change-Id: I653a1c68a8a9e46865c961672407be924045838d