Merge "Update download app icon treatment to latest mocks." into tm-qpr-dev