Merge "fix graphic buffer leak with persistent input surface" into mnc-dev