Merge "Fix bypass BAL via LocationManager.requestFlush" into tm-qpr-dev