Related cp#1000084: Make this work for other apps too and set proper default

Extend d98c817cc71e62a2beecc7142062f9ef33a7149b and fix default.

Change-Id: I79ad35bd5ad6fbd6e7d260864d4bf40fafb6b604