am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev

* commit '1cdbbb1e73bff05f5dd1679bae2e3502d4f82368':
  Changes to support new screen cast settings screen.