Gallery2: More material for filtershow

Change-Id: I2633910d3007a12103e45d319997d239aebbc4b8
Merge remote-tracking branch 'cm/cm-12.0' into HEAD

Conflicts:
	res/drawable/filtershow_background.png
	res/drawable/filtershow_background_new.png

Change-Id: I65009d73d646ee09a77428962d6fd240a76bdd2c