Merge "QuickBoot: enable QuickBoot Settings UI" into kk