Change default preload setting to 'Always'.

Also some tidying up to that the default is only specified in a
single place.

Change-Id: I6d66739a8b0d307f8af3c29c62d122a3044c4943
3 files changed