[2/2] Settings: Implement App circle sidebar

add whitelist app to include
fix Fcs

Change-Id: Ie4a5e970c1119c2812668de584a19453083139b9

Conflicts:
	res/values/mahdi_strings.xml

Conflicts:
	res/values/mahdi_strings.xml