Merge "SysUI: add a flag to control location indicators behavior."