Fix phq merge

[lrperlmu]

After merging into master, failing phq screen doesn't remove all the frames. Fix.

[lrperlmu]

Problem is that we started deleting at the wrong place because the test case has 2 blocker frames in a row. This is because the creation of the frames list is messy due to too many config flags. Merge config flags to simplify.

• [ ] merge config.consent_disclosure into config.study
  • [ ] config class
  • [ ] all usages
• [ ] merge config.self_report into config.study
  • [ ] config class
  • [ ] all usages
• [ ] merge config.pre_post_meaurement into config.study
  • [ ] config class
  • [ ] all usages
• [ ] merge config.mood_induction into config.study
  • [ ] config class
  • [ ] all usages

[lrperlmu]

did a quick bug fix that repairs the issue. keeping this ticket to resolve the technical debt.