Merge "Pre-rendering AOSP part" into r-keystone-qcom-dev