Merge "Keep overlay info for the android app info up to date" into tm-dev