Add back Gallery

Change-Id: I63bd8a1a898aa270da38ea8f53e0424c4582bd64