Do not use Gallery

Change-Id: Id06ee84f6375bbc0c9809fddc48a60237000bcdb