Merge "Replicates bounds calculation to SysUI package"