Merge "Fix ANR in SystemUI due to race condition." into tm-qpr-dev