Merge "Add Dynamic tiles for Settings"