Merge "Do not attempt to configure null preferred activity" into klp-dev
David Braun [Wed, 13 Nov 2013 23:42:08 +0000 (23:42 +0000)]

Trivial merge