Remove QuickBoot preference if package isn't available

Change-Id: I6f00b6be8d87c1013d2c695d93e66d276017b0a1
Merge branch 'remote' into mkl