Merge "Fix jank issue in Settings caused by fetching tile info" into oc-mr1-dev