Merge "Moves shelf offset into SysUI package"