Merge "Opt in systemui for BAL" into udc-qpr-dev