Merge "Moving report button up, and setting feature flag on"