Merge "[DO NOT MERGE] Fix flicker for Data Usage page" into tm-dev