am b6aea00c: Merge "Surface: Fix controlledByApp parameter" into klp-dev

* commit 'b6aea00c7843705fdc6d265d7e15b3df52e86009':
  Surface: Fix controlledByApp parameter