Finally fixed that weird Settings issue...Mahdi(Thank you so much)

Conflicts:
	res/xml/status_bar_settings.xml