Merge "Add Dynamic tiles for Settings"
am: b576e24d73

Change-Id: Ia5afe3adca0d38419109494706c14a84a3b03b6a