Merge "Adding bug number for each feature flag" into tm-qpr-dev