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