Merge "Fix AOSP boot animation black screen issue." into sc-qpr1-dev