Merge "SysUi: Distinguish between location indicator for system app ops vs others."