Fix copy&paste for EFL applications

Fixes issue 4021.
Merge branch 'helkanen-master'