Merge "Add activity indicator icons to quick settings tiles." into klp-dev