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

Change-Id: Ieedc4c25b8c2acfd03ef39c0bd2979b67c20e113