Merge "Move where prop dev.bootcomplete is set"