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

Change-Id: Ia34424f3b5f3f1882721d4d1aed85207113f000f