Move supportLib workaround to sample-app