Merge "Remove unused time tile and resources" into klp-dev