Merge "Updated quick settings assets." into klp-dev