Merge "Fix flag app being empty." into tm-qpr-dev