Merge "Fix bypass BAL via LocationManager.requestFlush" into sc-qpr1-dev